Merge changes from topic "default-value-query" am: 17f8ae5f7c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33f2c1591b2ae42c18aa55a4e2ef43acdb88bf91