Merge "Check if app's ntwk state will be changed before updating procstate." am: 36b9bc8e4b am: a27cba0c10 am: afbfc9f7ec

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

Change-Id: I8f9d72abb45b1ca508b36adec00ff4e87193e6d4