[automerger skipped] Merge "Migrate away from deprecated Truth APIs." am:...

[automerger skipped] Merge "Migrate away from deprecated Truth APIs." am: c5a500bf am: 1b69ab26 am: 94fa8e09 am: 01236ed3 -s ours

am skip reason: Change-Id I76f9c37cb699ce6ab8715ffe35d11668ccbceea1 with SHA-1 46e85a2f is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661

Change-Id: Ia3f030f48315b88be8606576f563ee39707df8f8