Merge upstream tag 'v1.46.6' into aosp/master

Upgrade from v1.46.6-rc1+ to v1.46.6.

Change-Id: I5a9c95783dd1850dbdd994b2c23a68fdb788df47