Merge "Update theme after overlay" into sc-v2-dev am: 3d45e08e61 am: db78ccb5a4

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

Change-Id: Ie5d2a5b9435d936d2bfd487746c7b1236609c89a