Merge "Remove redundant private visibilities" am: ed01b3d2 am: a94d44fe am: e3ef5d72

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



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