[automerger skipped] Partial cp of "Move Tuner resource updating from Tuner java into Tuner client" am: 459d9506ee am: 8070534537 am: f15dfd0e7f -s ours

am skip reason: skip tag Change-Id I46acdd2f118d5b082aa162c680661a304b4f628b with SHA-1 39a3fa4653 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655735

Change-Id: I73f33ddbb76a2ced89851be1ec2f23376c39a2e1