tree acab020fc60999f2707be94193ea5d9f2186c72c
parent 5c8eab6ae2180b1172827258e7a73677ddd8626e
parent 6f2b986ee408789aed069a567e853f6405c371b9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576346445 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576346445 +0000

Merge "Pipe featureId from app to noteOp in BT code" am: 775540c6d6 am: 6f2b986ee4

Change-Id: Ia2d0a51a73020b81cb8991ff783fa826328265cc