Merge "Merge "Don't set animation pending when gaining fake control" into tm-dev am: c15af2cb am: 1a2338e9" into tm-d1-dev-plus-aosp am: 72d61e0d

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



Change-Id: Ia6a4904f9fa6585b48b8d6ac291ccfbbcdf50331
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>