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

Merge "Use non-cached value when calculation button forced visible state" into udc-dev am: fa6c4fde am: cad1cbd6

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



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