am 496a669b: am dc0a5403: Merge "CMAS opt-out setting does not work when...
am 496a669b: am dc0a5403: Merge "CMAS opt-out setting does not work when switching from Secondary user to Device owner" into lmp-mr1-dev
* commit '496a669b':
CMAS opt-out setting does not work when switching from Secondary user to Device owner