am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed"

* commit '52749c0b1117a05a9c853b7d54f69a281f69cf3c':
  frameworks/base: acquire lock on am only when needed