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