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