Merge "ApiCouncil review round3 / setHidden, Query.getExtras" into sc-dev am: 46d6e25d25 am: 4062c9f6a9 am: 83ca4a9b43
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14683051 Change-Id: I6e3b7dd06dc274ec481592d1287da9c0a0153c73
This commit is contained in: