Merge "Don't set animation pending when gaining fake control" into tm-dev am:...

Merge "Don't set animation pending when gaining fake control" into tm-dev am: c15af2cb am: 7da22313

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



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