tree 748e3779031e49db57d120855a2be43fe663432c
parent ecb34129dcad98dfb04090047314da80597cd926
parent 441e35f6122f1209bde6ffbe485e0bdfc7b8f334
author Yan Yan <evitayan@google.com> 1613166119 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613166119 +0000

Merge changes Ifc8ad902,I6d1b8d0e am: 8d659bb1ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12bd81925142b20a04448952de67cb72d77b4ccd