[automerger skipped] Merge "Individual attestation: Feature file am: 8181bb0fd0 am: 4a0203df9e am: 2eda013f7a" into rvc-qpr-dev-plus-aosp am: 902cf58e42 -s ours
am skip reason: Change-Id I6e4577b793d6b28bff855d74b313be7eeeab3f05 with SHA-1 8181bb0fd0 is in history

Change-Id: Iba367abe1e40a6a943e53d3bf175d8884b27f4cb