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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I448bcc719e7e02421e629920eb84d12c8e3c0023