Merge "Optimize ActiveServices targetSdkVersion fetch" into tm-dev am:...

Merge "Optimize ActiveServices targetSdkVersion fetch" into tm-dev am: 81fdbfc0 am: 4da827d4 am: a3600068

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



Change-Id: Id8fdcc72b6400645c8d1a8cd5a1297f74cfc83ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>