Merge "Fix spinner not shows up" into tm-dev am: 2caa7236 am: a7dfb0b2 am:...

Merge "Fix spinner not shows up" into tm-dev am: 2caa7236 am: a7dfb0b2 am: ed38c123 am: 363dec11

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



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