Merge "Revert "Enable context dropping on stopped only"" into udc-dev am: 02f47849

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



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