Merge "Fix InlineFilteringTest#testFiltering_filtersByPrefix" into tm-dev am: 6a435bb6 am: 2d7367fe am: 2bb35a1b

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



Change-Id: I8b5809281467cdd731bed9ba6395bf40ed5d13b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>