Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  GetDirectDepWithTag needs to check all tags before panicing
  Allow Context to query Singletons

Test: Manual
Bug: 124507633
Bug: 125933724

Change-Id: If0a51961133a7dcbe7c779220130a203bcabed70