Merge changes from topics "172251878", "presubmit-am-7890421506ee474b9057d3c5d333e341" into tm-dev am: 82b28764 am: 4c59ad85

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

Change-Id: Iab9e8324dec650b32394db1e5ff31f66b7e37e9b