[automerger skipped] Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev...

[automerger skipped] Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev am: 623049ad am: 4134ac8a -s ours

am skip reason: Change-Id I7d576248bb9931059100facb67ca6b46e81e554e with SHA-1 ab6df3a3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I186f0508326b732a25f1afed3e1992c719e0df5e