Merge changes from topic "remove_flag_1" into main am: 02c402cd am: c9370503

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3271573



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