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

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



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