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