Merge changes from topic "jul15" am: 0e27faa0 am: 954431c4 am: fd0915ae am: 70123a91

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



Change-Id: I6d5cc1577c71cf60fe16c62d5523cfb5c3a10468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>