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

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



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