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: Ifbd24e654b95229b784c017edc751b1023b6efb4