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