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

Merge "Fix spinner not shows up" into tm-dev am: 2caa7236 am: 3a78b1b2 am: c28a515f am: 8019f609

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



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