Merge changes from topic "mpietal_rewire" into tm-qpr-dev am: 4d3faa427d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20079400 Change-Id: I3b1f91f8aee45dde96d5606627dcb1bfa478ac5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: