Merge "Fix handling usb notification after pr_swap complete" am: b681fec035

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

Change-Id: I2df61f61b2ce2ff7934286e8e04d572f2042a523