Merge changes from topic "mpietal_rewire" into tm-qpr-dev am: 4d3faa42 am: 6423dddf

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



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