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

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



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