Merge "Reset identity context in STService" into udc-dev am: fb0356f7

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



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