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