[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION...

[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into sc-dev am: d624bcc0 am: 4d31f389 -s ours am: bb0c0633 -s ours am: 0dfcb15f -s ours

am skip reason: subject contains skip directive

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



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