[automerger skipped] Add framework change for manifest API change am: dfdcef6d am: 059e97f0 -s ours

am skip reason: Merged-In I459c629b9f8494a8fefd20ea15daa6257af055c8 with SHA-1 3f4bdc7c is already in history

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



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