Merge changes from topic "reroute-lmkd-ams" into sc-dev

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