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