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: f58f662e

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



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