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

Merge "Revert "Use non-cached value when calculation button forced visible state"" into udc-dev am: 4a349631 am: a9af64a9

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



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