Merge "init/service_parser: Add arguments `window' and `target' for `critical'" am: 9b4debbc27 am: f5820674cd am: 1ad02691f1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1202249

Change-Id: I8fdf75719020aebddb198a8b5eeca3705e6afb3a