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

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



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