tree 9aed371a622ddcea4e171a3a5d4d03829b89fcb2
parent 9b58ed12cc7a76388c1b7c89442e8b2010db897c
parent f619c9967dba7ec39494ad767decbea52331e868
author Zoey Chen <zoeychen@google.com> 1615289046 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615289046 +0000

Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd41c34f9e4dff1ca7930a9fc2a6f06ec8c316ba