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: f6538443 am: 86c901bd

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



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