Merge "Use non-cached value when calculation button forced visible state" into...

Merge "Use non-cached value when calculation button forced visible state" into udc-dev am: fa6c4fde am: 8b945f32

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



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