Merge "Add a flicker test to verify IME snapshot when dismissing dialog" into...

Merge "Add a flicker test to verify IME snapshot when dismissing dialog" into tm-dev am: cd9af561 am: dd36f7fa

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



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