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