Merge "Do not annouce Collapse/Expand if there are less or equal to 2 permissions in the list" into udc-dev am: 0bd4117a76 am: 9b209a1373 am: 35fefe87d1

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

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