Merge "Make android.intent.action.MASTER_CLEAR depreciation explicit" into oc-dev am: e768104f9b
am: 358ec57382

Change-Id: I56c2a327f56ec5108f8654907a1a0cc288c9e7d9