Merge "Add boot flags for metadata query" into sc-dev am: 214898d0 am: 8e56372d am: d31f48ab

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

Change-Id: I60849815a58a5c415aeb70858ca44447b2730e35