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

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



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