Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2700639 Change-Id: Id6930989f68707820aaeb9770acece73cbf744ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>