Merge changes from topics "presubmit-am-41e144351270485b94f495fc32653e46",...

Merge changes from topics "presubmit-am-41e144351270485b94f495fc32653e46", "presubmit-am-d52b531f305c4668b1dfe4f906403ae6" into tm-dev am: 36e2df5b

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



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