Merge "Only enable scanner entry points if the scanner activity is callable" into tm-dev am: 65858d10 am: 11ad3503

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

Change-Id: Iaa6a1b0c9a33550097f8d691ccebb08e447910e2