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