Merge "Apply theme by using notification context" am: abca0166d7 am: a5181ef40d

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

Change-Id: Ia854218cd6c1b085e103ca39819de862aee40096