Merge "Update Prevent Ringing setting to avoid conflict with long press power" into sc-dev am: 1d2371eecd am: 73ac657abe am: e7f9bc91bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175451 Change-Id: I67ef3b54238156a669e57da834144e4803661401
This commit is contained in: