Merge "[automerger skipped] Merge "[TNU03] Add TetheringNotificationUpdaterTest" into rvc-dev am: c49b2084 am: 6924e401 -s ours" into rvc-d1-dev-plus-aosp am: ef763011 -s ours am: d1a7bf56 -s ours

am skip reason: Change-Id I0db3df3e85dd6a8c3989c8bc66a06c50f45a0c15 with SHA-1 8d692803 is in history

Change-Id: Id17a98af333ea2dba763b051adde4e3f8e5f508b