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