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

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



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