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: Idf896d3d42fad8733f710c5fc434949340e7836d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>