Merge "Remove user icon avatar from memory when unlocked" into tm-dev am: 5c011d09 am: 7c9cc03d

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



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