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