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

Merge "Do not annouce Collapse/Expand if there are less or equal to 2 permissions in the list" into udc-dev am: 0bd4117a am: 9b209a13 am: 35fefe87 am: 43a32105

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



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