Merge changes from topics "presubmit-am-5fd168d48bd342588d0e4ecebec59023",...

Merge changes from topics "presubmit-am-5fd168d48bd342588d0e4ecebec59023", "presubmit-am-ba97c7d37aa34eb7805ec5598caea41d" into tm-dev am: 1c4a8c20 am: d04bcd05

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

Change-Id: I433b212ab5e79bc27c86e256ee3e6684b8895ff0