[automerger skipped] Merge "Add local log" am: 46b35eba am: 1ba2ca7c -s ours am: 88cb7a60 -s ours am: e596eea5 -s ours

am skip reason: Merged-In Ib250e38fc5a034a6d2a327b2ee159e7186a15ada with SHA-1 370cc2f6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706227

Change-Id: Ibbaf2407b79b1b30f3ec7e0674c613097679ee1c