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

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



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