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

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



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