Update to preference 1.3

Update code that is blocking the upgrade to preference 1.3

Fix: 292152319
Test: atest HealthConnectControllerUITests
Change-Id: I53c5fa06f2f8f50ec35887a46e9179c8fc45f6fa
Merged-In: I53c5fa06f2f8f50ec35887a46e9179c8fc45f6fa
(cherry picked from commit b0b2f5f0083816233206e6b3c31bdc84fc7af01e)
13 files changed