Merge "Merge "Do not annouce Collapse/Expand if there are less or equal to 2...

Merge "Merge "Do not annouce Collapse/Expand if there are less or equal to 2 permissions in the list" into udc-dev am: 0bd4117a am: fa77f60e am: f21aafd1" into udc-qpr-dev-plus-aosp am: 07bb0ebb

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



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