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 am: 96e6e1cc" into tm-qpr-dev-plus-aosp am: 48adfeac

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



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