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