Merge "Modify non updatable droidstubs dependency based on release flag" into...

Merge "Modify non updatable droidstubs dependency based on release flag" into main am: badbb20d am: 41a5c0df

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



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