[automerger skipped] Merge "Fix the scanning on non-APEX devices." am: 6589fd10 am: fb8dbf91 am: ac889bc8 am: 2adab048 -s ours

am skip reason: Merged-In I238e88684f48981c44e7152f97b4ca16bed6d166 with SHA-1 ac67508f is already in history

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

Change-Id: I915b7ea65bf86776b495234f5b86d13feb92da12