Merge changes from topic "da-rearc" into sc-v2-dev-plus-aosp am: 8ee22a34 am: 0636e1ec

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

Change-Id: I8d65176cba8290bc85f73a2970daf0451d8989b1