[automerger skipped] Improve the windows register and unregister mechanism am:...

[automerger skipped] Improve the windows register and unregister mechanism am: 31eaf452 am: cb93f26f -s ours

am skip reason: Merged-In I00fd1f45c0b4e362143a8d82f31264ff202f0967 with SHA-1 5b8b7377 is already in history

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

Change-Id: I6edde472c51b13cc9a15522aa4a28d4b80cf7aa9