Merge "Forward `svc bluetooth` to "cmd bluetooth"" am: 199359822e am: 638e111b5b

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

Change-Id: I7340a7feb1a21bd6af2da98c9f6992a8d911b681