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

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

Change-Id: I589319847b50bba4350dab72a52dc962f032a7c0