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

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

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



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