Merge tm-qpr-dev-plus-aosp-without-vendor@9467136

Bug: 264720040
Merged-In: Ica8ced5dc86990d2fdf9d97bc4a558f885425516
Change-Id: I0264fb7046ff183f8e64d07844246537a849f40a