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

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

Change-Id: Iadbc325c2d6741dcf37e451e7ee855f8045e4237