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