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 am: 229211f5

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



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