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