Merge "Use context theme wrapper with specific theme when inflating button" into udc-dev am: 1f317d8d am: fc8ca9c7

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



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