Merge "Revert suppression of recalculation to fix jump after aod->ls animation...

Merge "Revert suppression of recalculation to fix jump after aod->ls animation am: c003cb87 am: b3d48b82" into tm-d1-dev-plus-aosp am: b70c2572

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



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