Merge upstream commit 'ee786f0f351281875c48a8e77810d7b35e0d4671' into master am: 65c5c618d0

Original change: https://android-review.googlesource.com/c/platform/external/pandora/avatar/+/2183016

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