Merge "Fix avatar picker issues relating to screen rotation." into tm-dev am: 9d1cf05c

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



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