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

Merge "Reland "Use non-cached value when calculation button forced visible state"" into udc-dev am: 7d852314

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



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