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