Merge "Add API to set launch TDA featureId in options" am: 362e1c6eb4 am: 159473f75a am: 93c848722a

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

Change-Id: Ib8a08496792200478ffdcf053114911e673e0399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>