Merge changes from topic "move-gallery" into tm-qpr-dev am: d5cbd9a7 am: d0d6108d

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



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