Merge "Allow shell to invoke music recognition api" am: a7d6351972 am: 7f1f7169c2

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

Change-Id: I3087d7b8dc5fb6471b89afcf8e44408aa30c76b1