Merge "Multi-shade foundation - integration (5/5)." into udc-dev am: 0003196b am: ef889a1c

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



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