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