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