Merge "Fix the scanning on non-APEX devices." am: 6589fd106d

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

Change-Id: I96575cfdec30d5b9e7183d6559fc223c359b34d7