Merge "[Telephony Mainline] Hide notifyUserActivity API in R" into rvc-dev am: bcb1f3db am: ea2103f6 Change-Id: Ia8d789f8c06b562a3f2cc120c8f1bcf30e21e70c