Merge changes from topic "lmkd_ams"

* changes:
  AMS: added caching DataInputStream object
  ActivityManagerService: reroute lmkd atoms logging