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