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

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

Change-Id: Iec41da939e171a9a7a03f076508e598595155960